Implemented RFC 7239 - "Forwarded HTTP Extension"#94
Merged
dg merged 8 commits intonette:masterfrom Jun 17, 2016
patrickkusebauch:master
Merged
Implemented RFC 7239 - "Forwarded HTTP Extension"#94dg merged 8 commits intonette:masterfrom patrickkusebauch:master
dg merged 8 commits intonette:masterfrom
patrickkusebauch:master
Conversation
src/Http/RequestFactory.php
Outdated
| $url->setPort((int) $_SERVER['HTTP_X_FORWARDED_PORT']); | ||
| } | ||
| if (isset($proxyParams['for'])) { | ||
| $remoteAddr = explode(':', $proxyParams['for'][0])[0]; |
Contributor
There was a problem hiding this comment.
This will not work with IPv6.
Will now work with IPv6. Added tests for port and scheme of the URL
- Split test into "x-forwarded" and "forwarded" files for proxy - Added tests for default scheme. - Added tests for every combination of IPv4/IPv6 with and without port for both "host" and "for" headers
Contributor
|
possible related #92 |
| foreach ($forwardParams as $forwardParam) { | ||
| $param = explode("=", $forwardParam); | ||
| $proxyParams[strtolower(trim($param[0]))][] = trim($param[1], "\"\t\n\r\0\x0B"); //e.g. array['for'][0] = 192.168.0.1 | ||
| } |
Contributor
There was a problem hiding this comment.
This can be simplified to
foreach ($forwardParams as $forwardParam) {
list($key, $value) = explode('=', $forwardParam, 2) + [1 => NULL];
$proxyParams[strtolower(trim($key))] = trim($value, " \t\"");
}
Contributor
Author
|
I know that it keeps failing on php5.6 with composer update --no-interaction --prefer-dist --prefer-lowest --prefer-stable. However this cannot be redeemed as the tests have to change to keep up with the versions. Furthermore they are test unrelated to this pull request. |
Contributor
Author
|
Any other problems to be fixed with this PR? |
Member
|
Is it ready for merge? |
Contributor
Author
|
Since there were no comments to the PR for more than 3 weeks, I would assume nobody has any more problems with it. |
Member
|
So thanks! |
Contributor
Author
|
I thank you for letting me be a part of the development of Nette. :) |
dg
pushed a commit
that referenced
this pull request
Jun 17, 2016
* Implemented RFC 7239 - " Forwarded HTTP Extension" handling in RequestFactory * Implemented RFC 7239 - " Forwarded HTTP Extension" handling in RequestFactory * Deleted echo statement * case- insensitive handling of tokens * Proper handle of quoted strings. Will now work with IPv6. Added tests for port and scheme of the URL [Closes #94] * Tests refactoring: - Split test into "x-forwarded" and "forwarded" files for proxy - Added tests for default scheme. - Added tests for every combination of IPv4/IPv6 with and without port for both "host" and "for" headers * Code simplifications * Fixed coding standards for tests
dg
pushed a commit
that referenced
this pull request
Jun 17, 2016
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
RequestFactory can now take "RemoteAddress", "RemoteHost", "port" and "scheme" from the proxy "FORWARDED" header.